<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
    <style>
        #father {
            width: 400px;
            height: 400px;
            background-color: pink;
<<<<<<< HEAD
            padding: 1px;
        }

=======
            border: 1p solid transparent;
        }
        
>>>>>>> origin/master
        #son {
            width: 200px;
            height: 200px;
            background-color: saddlebrown;
            margin-top: 200px;
<<<<<<< HEAD
            font-size: 30px;
            text-shadow: 2px 2px 2px rgba(0,0,0,.5);
        }


=======
        }
>>>>>>> origin/master
    </style>
</head>

<body>


<<<<<<< HEAD
<div id="father">
    <div id="son">ddddddddd</div>
</div>
=======
    <div id="father">
        <div id="son">dddd</div>
    </div>
>>>>>>> origin/master
</body>

</html>